Changed version code on master branch
Merge branch 'develop'

Conflicts:
	install.html