Merge branch 'develop'

34 files changed, 4 insertions, 0 deletions

diff --git a/README.md b/README.md
index d0a758d..50fe13d 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,10 @@ GS5
 ===
 Gemeinschaft 5 by [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. This Github repository is our development environment.
 
+Documentation
+=============
+Please have a look at our [Wiki](https://github.com/amooma/GS5/wiki).
+
 Bug reports
 ===========
 Please open a new issue to report a bug. Please don't forget to include the URL in case you report a view related problem.
diff --git a/app/assets/icons/cellphone-32x.png b/app/assets/icons/cellphone-32x.png
new file mode 100644
index 0000000..cfc41f5
--- /dev/null
+++ b/app/assets/icons/cellphone-32x.png
diff --git a/app/assets/icons/clock-32x.png b/app/assets/icons/clock-32x.png
new file mode 100644
index 0000000..c076042
--- /dev/null
+++ b/app/assets/icons/clock-32x.png
diff --git a/app/assets/icons/cross-16x.png b/app/assets/icons/cross-16x.png
new file mode 100644
index 0000000..e22ed6f
--- /dev/null
+++ b/app/assets/icons/cross-16x.png
diff --git a/app/assets/icons/facebook-32x.png b/app/assets/icons/facebook-32x.png
new file mode 100644
index 0000000..08fa0f7
--- /dev/null
+++ b/app/assets/icons/facebook-32x.png
diff --git a/app/assets/icons/fax-32x.png b/app/assets/icons/fax-32x.png
new file mode 100644
index 0000000..b05ee59
--- /dev/null
+++ b/app/assets/icons/fax-32x.png
diff --git a/app/assets/icons/gs_envelope_16x.png b/app/assets/icons/gs_envelope_16x.png
new file mode 100644
index 0000000..6a82ade
--- /dev/null
+++ b/app/assets/icons/gs_envelope_16x.png
diff --git a/app/assets/icons/gs_forward_16x.png b/app/assets/icons/gs_forward_16x.png
new file mode 100644
index 0000000..13c57eb
--- /dev/null
+++ b/app/assets/icons/gs_forward_16x.png
diff --git a/app/assets/icons/gs_missed_16x.png b/app/assets/icons/gs_missed_16x.png
new file mode 100644
index 0000000..0b3b706
--- /dev/null
+++ b/app/assets/icons/gs_missed_16x.png
diff --git a/app/assets/icons/gs_placed_16x.png b/app/assets/icons/gs_placed_16x.png
new file mode 100644
index 0000000..b5065e9
--- /dev/null
+++ b/app/assets/icons/gs_placed_16x.png
diff --git a/app/assets/icons/gs_received_16x.png b/app/assets/icons/gs_received_16x.png
new file mode 100644
index 0000000..cd40c1a
--- /dev/null
+++ b/app/assets/icons/gs_received_16x.png
diff --git a/app/assets/icons/headphones-16x.png b/app/assets/icons/headphones-16x.png
new file mode 100644
index 0000000..dee8346
--- /dev/null
+++ b/app/assets/icons/headphones-16x.png
diff --git a/app/assets/icons/headphones-32x.png b/app/assets/icons/headphones-32x.png
new file mode 100644
index 0000000..89a5df7
--- /dev/null
+++ b/app/assets/icons/headphones-32x.png
diff --git a/app/assets/icons/house-32x.png b/app/assets/icons/house-32x.png
new file mode 100644
index 0000000..b112915
--- /dev/null
+++ b/app/assets/icons/house-32x.png
diff --git a/app/assets/icons/mic-32x.png b/app/assets/icons/mic-32x.png
new file mode 100644
index 0000000..30c4531
--- /dev/null
+++ b/app/assets/icons/mic-32x.png
diff --git a/app/assets/icons/microphone-16x.png b/app/assets/icons/microphone-16x.png
new file mode 100644
index 0000000..b62422d
--- /dev/null
+++ b/app/assets/icons/microphone-16x.png
diff --git a/app/assets/icons/microphone-32x.png b/app/assets/icons/microphone-32x.png
new file mode 100644
index 0000000..30c4531
--- /dev/null
+++ b/app/assets/icons/microphone-32x.png
diff --git a/app/assets/icons/mute-16x.png b/app/assets/icons/mute-16x.png
new file mode 100644
index 0000000..0656f3f
--- /dev/null
+++ b/app/assets/icons/mute-16x.png
diff --git a/app/assets/icons/phone-down-32x.png b/app/assets/icons/phone-down-32x.png
new file mode 100644
index 0000000..38c3560
--- /dev/null
+++ b/app/assets/icons/phone-down-32x.png
diff --git a/app/assets/icons/phone-down-green-32x.png b/app/assets/icons/phone-down-green-32x.png
new file mode 100644
index 0000000..9f21d45
--- /dev/null
+++ b/app/assets/icons/phone-down-green-32x.png
diff --git a/app/assets/icons/phone-down-grey-32x.png b/app/assets/icons/phone-down-grey-32x.png
new file mode 100644
index 0000000..2b604ce
--- /dev/null
+++ b/app/assets/icons/phone-down-grey-32x.png
diff --git a/app/assets/icons/phone-down-red-32x.png b/app/assets/icons/phone-down-red-32x.png
new file mode 100644
index 0000000..f4cbde7
--- /dev/null
+++ b/app/assets/icons/phone-down-red-32x.png
diff --git a/app/assets/icons/phone-mobile-32x.png b/app/assets/icons/phone-mobile-32x.png
new file mode 100644
index 0000000..b373e1a
--- /dev/null
+++ b/app/assets/icons/phone-mobile-32x.png
diff --git a/app/assets/icons/phone-up-32x.png b/app/assets/icons/phone-up-32x.png
new file mode 100644
index 0000000..9b765c7
--- /dev/null
+++ b/app/assets/icons/phone-up-32x.png
diff --git a/app/assets/icons/search-13x16.png b/app/assets/icons/search-13x16.png
new file mode 100644
index 0000000..16aa3c6
--- /dev/null
+++ b/app/assets/icons/search-13x16.png
diff --git a/app/assets/icons/skype-32x.png b/app/assets/icons/skype-32x.png
new file mode 100644
index 0000000..c3b0978
--- /dev/null
+++ b/app/assets/icons/skype-32x.png
diff --git a/app/assets/icons/star-16x.png b/app/assets/icons/star-16x.png
new file mode 100644
index 0000000..6b16932
--- /dev/null
+++ b/app/assets/icons/star-16x.png
diff --git a/app/assets/icons/suitcase-32x.png b/app/assets/icons/suitcase-32x.png
new file mode 100644
index 0000000..f53daa9
--- /dev/null
+++ b/app/assets/icons/suitcase-32x.png
diff --git a/app/assets/icons/tag-16x.png b/app/assets/icons/tag-16x.png
new file mode 100644
index 0000000..b4522d7
--- /dev/null
+++ b/app/assets/icons/tag-16x.png
diff --git a/app/assets/icons/twitter-32x.png b/app/assets/icons/twitter-32x.png
new file mode 100644
index 0000000..51351a7
--- /dev/null
+++ b/app/assets/icons/twitter-32x.png
diff --git a/app/assets/icons/unmute-16x.png b/app/assets/icons/unmute-16x.png
new file mode 100644
index 0000000..e9dfde0
--- /dev/null
+++ b/app/assets/icons/unmute-16x.png
diff --git a/app/assets/icons/user-16x.png b/app/assets/icons/user-16x.png
new file mode 100644
index 0000000..909403a
--- /dev/null
+++ b/app/assets/icons/user-16x.png
diff --git a/app/assets/icons/user-female-16x.png b/app/assets/icons/user-female-16x.png
new file mode 100644
index 0000000..38dde34
--- /dev/null
+++ b/app/assets/icons/user-female-16x.png
diff --git a/app/assets/icons/user-male-16x.png b/app/assets/icons/user-male-16x.png
new file mode 100644
index 0000000..e03fd0f
--- /dev/null
+++ b/app/assets/icons/user-male-16x.png