Changes made by Milos Bozic (mbozic@execom.eu).
push notifications
Changes made by Milos Bozic (mbozic@execom.eu).
push
Merge branch 'master' of https://github.com/1000words/1000words.git

Conflicts:
	1000Words/scripts/app/mapExplorerViewModel.js
	1000Words/scripts/app/notificationWindowViewModel.js
Changes made by Milos Bozic (mbozic@execom.eu).
slknfldks
Merge branch 'master' of https://github.com/1000words/1000words.git