commit
Merge branch 'master' of github.com:Helldran/AppMobile

Conflicts:
	assets/www/add_object.html