MOB-167 infowindow start
MOB-167 infowindow styling with placeholder
Merge branch 'MOB-167' of https://github.com/Maryami/hermes into MOB-167
MOB-167 infowindow touches
Merge branch 'MOB-167' of https://github.com/Maryami/hermes into MOB-167
Merge branch 'MOB-167' of github.com:Maryami/hermes into MOB-167
Merge branch 'master' into MOB-167
MOB-166 Additional work on info windows
Merge branch 'MOB-167' of github.com:carllarsson/hermes into MOB-167
MOB-167 Fixed icons
MOB-133 Added styling to accessibility view
MOB-232 Added sorting to list of departments.
MOB-167 More fixes to icons in infoWindow
MOB-167 Moved building name to new row in infoWindow
MOB-232 Added test of sorting list of departments.
MOB-167 Fixed some tests
MOB-167 Fixed some more tests
MOB-167 Fixed failing tests
Merge branch 'master' of github.com:stockholmuniversity/hermes into MOB-167

Conflicts:
	assets/www/spec/modules/map/info-window-view.spec.js
MOB-167 Fixed more tests