+local commit before  pull, no major changes
Merge branch 'master' of https://github.com/samuelmolinski/fuzzy-octo-hipster

Conflicts:
	protected/config/main.php
refactoring in progress