MOB-176 Added spinner to map loads
MOB-176 Added load spinner when application is working
MOB-176 Added description of styles in CSS
A merge fix
MOB-256 - Changed position of the filter list and map content to fix the overlay bug when clicking cancel button
MOB-256 - Indentation fix
Merge pull request #162 from carllarsson/MOB-256

MOB-256 - Changed position of the filter list and map content to fix the...
Changed cordova.js back to the android version.
Merge pull request #164 from iceglow/cleanup

Changed cordova.js back to the android version.
Merge branch 'master' of https://github.com/stockholmuniversity/hermes into MOB-246

Conflicts:
	assets/www/map/css/mapapp.css
Merge branch 'master' of https://github.com/stockholmuniversity/hermes into MOB-246

Conflicts:
	assets/www/map/css/mapapp.css