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

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

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