Gun Bomb will merge with boonrod soon
Merge branch 'master' of https://github.com/picnii/ananda-rush

Conflicts:
	js/Controller.js
	service/Controller/AppointController.php
	service/Controller/PromotionController.php
	service/Model/Appointment.php
	service/Model/Payment.php
	service/Model/Transaction.php
	template/appoint.html
	template/print.html
	template/promotion-match.html