Changes made by Nikola Milanovic (nmilanovic@execom.eu).
Merge branch 'master' of https://github.com/1000words/1000words.git

Conflicts:
	1000Words/scripts/app/mapExplorerViewModel.js
	1000Words/scripts/app/notificationsViewModel.js