Merge origin/master

Conflicts:
	app/scripts/controllers/main.js
	app/styles/main.css
	app/views/main.html
Merge origin/master

Conflicts:
	app/scripts/controllers/main.js
	app/styles/main.css
	app/views/main.html
Merge origin/master

Conflicts:
	app/scripts/controllers/main.js
	app/styles/main.css
	app/views/main.html
Merge origin/master

Conflicts:
	app/scripts/controllers/main.js
	app/styles/main.css
	app/views/main.html
Merge origin/master

Conflicts:
	app/scripts/controllers/main.js
	app/styles/main.css
	app/views/main.html
Merge origin/master

Conflicts:
	app/scripts/controllers/main.js
	app/styles/main.css
	app/views/main.html
Merge origin/master

Conflicts:
	app/scripts/controllers/main.js
	app/styles/main.css
	app/views/main.html
Merge origin/master

Conflicts:
	app/config/database.php
	bootstrap/compiled.php
	vendor/autoload.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_real.php