Merge branch 'master' of https://github.com/segconn/book-my-movie-seats

Conflicts:
	app/config/app.php
dunno

dunno