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
Added some tests for InfoWindowView
MOB-166 Additional work on info windows
Hold the splash screen for half a second to let the browser paint the content, avoids flickering.
Set splash timeout in config.
Merge pull request #135 from iceglow/cleanup

Hold the splash screen for half a second to let the browser paint the co...
Avoid calling api during test.
Merge pull request #136 from iceglow/cleanup

Avoid calling api during test.
Cleanup - Mended some broken test.
Merge pull request #137 from pmampe/cleanup

Cleanup - Mended some broken test.
Merge branch 'master' of github.com:stockholmuniversity/hermes into tests
Merge branch 'master' of github.com:stockholmuniversity/hermes into spa

Conflicts:
	assets/www/js/views/start-view.js
	assets/www/spec/modules/start/start-view.spec.js
Merge branch 'MOB-167' of github.com:carllarsson/hermes into MOB-167
Added tests for location views.