aa
Merge branch 'develop' of github.com:ibsbs/laravel4.2_study into develop

Conflicts:
	app/storage/logs/laravel.log