Merge Branchnch 'Staging'

Conflicts:
app/client.js
app/scripts/controllers/adminarea.js
app/styles/treatments.css
www/index.php
www/styles/main.css
www/styles/mobiletablet.css
quick changes