Working Camera Update, except the stupid camera button doesn't work

Someone please fix this BS. Camera.html has the working camera code,
you need all of it, for some reason I can’t run the camera from that
page.

—Used latest website branch, run apk to understand what is happening.
(open project folder (‘GivingGoods’) in eclispe, run on emulator, etc.)
Merge branch 'master' of https://github.com/mbatilando/givingGoods

Conflicts:
	.DS_Store
	GivingGoods/www/addRequest.html
	GivingGoods/www/css/mari-custom.css
	GivingGoods/www/dashboard.html
	GivingGoods/www/dashboardNew.html
	GivingGoods/www/images/dashPic.png
	GivingGoods/www/images/dashboardBG.jpg
	GivingGoods/www/images/dashboardBGORIG.jpg
	GivingGoods/www/images/message1.jpg
	GivingGoods/www/images/message2.jpg
	GivingGoods/www/images/message3.jpg
	GivingGoods/www/images/message4.jpg
	GivingGoods/www/images/message5.jpg
	GivingGoods/www/index.html
	GivingGoods/www/messageList.html
	GivingGoods/www/orgDashboard.html
	GivingGoods/www/orgDashboardNew.html