Setting Added / Setting Helper Added / Web Service Changed to support Setting helper
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/item_reserve.xml