changes

Button size adjust, android screen resolutions adjust, but getting some
problem in box collapse adjustment
Merge remote-tracking branch 'origin/master'

Conflicts:
	myApp/www/js/app.js