Downgrade Laravel to 4.1
Downgrade Laravel to 4.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/app.php
	app/models/Association.php