Update composer.json
Update composer.json
Update bower.json
V 2.1
Merge branch 'dev'

Conflicts:
	app/config/app.php
	app/views/public/home.blade.php
	bower.json
	public/themes/public/assets/js/scripts.js
	public/themes/public/config.php
	public/themes/public/layouts/home.blade.php
	public/themes/public/partials/footer.blade.php
Merge branch 'master' of https://github.com/LavaLite/cms

Conflicts:
	app/config/app.php
	app/views/public/home.blade.php
	bower.json
	public/themes/public/assets/js/scripts.js
	public/themes/public/config.php
	public/themes/public/layouts/home.blade.php
	public/themes/public/partials/footer.blade.php
Updates
Release
Merge branch 'dev'

Conflicts:
	bower.json
	composer.json
Merge branch 'dev'

Conflicts:
	composer.json
Merge branch 'master' into dev