Merge branch 'develop' of https://github.com/dniskav/naveshtml5 into develop

Conflicts:
	main.js
Merge branch 'develop' of https://github.com/dniskav/naveshtml5 into develop

Conflicts:
	main.js