Refactor mail and log jobs
Merge origin/master

Conflicts:
	app/controllers/SearchController.php
	app/forms/SearchForm.php
Merge origin/master

Conflicts:
	app/controllers/SearchController.php
	app/forms/SearchForm.php
Add main scss
Merge origin/master
add feedback page
Add main scss
Merge origin/master
Add main scss
Add main scss
remove mail.php
Correct styles
remove mail.php
Fix base url
Merge origin/master

Conflicts:
	app/views/index.phtml
	app/views/search/make.phtml
Merge origin/master

Conflicts:
	app/views/index.phtml
	app/views/search/make.phtml