Merge origin/master

Conflicts:
	application/controllers/booking.php
	application/controllers/reg.php
	application/controllers/stadium.php
	application/controllers/users.php
	application/models/stadium_model.php
	application/models/user_model.php
	application/views/Tabeditstadium/addcourt.php
	application/views/Tabeditstadium/mycourt.php
	application/views/Tabeditstadium/setting.php
	application/views/template/footer.php
	application/views/template/head.php
	application/views/template/modal.php
	asset/js/bootstrap-datetimepicker.min.js
	asset/js/jquery-1.8.3.min.js
	asset/js/js_2/global.js
	asset/js/js_2/jquery.js
	asset/js/js_2/jquery.nivo.slider.js
	asset/js/js_2/slider/default.css