url change
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/www/app/controller/Main.js
merged files
Merge remote-tracking branch 'origin/master'