master
ignore html5/platforms
remove origin
master
ignore html5/platforms
login page
ignore html5/platforms
ignore html5/platforms
remove origin
ignore html5/platforms
master
Merge branch 'HTML5'

Conflicts:
	html5/plugins/ios.json