Merge branch 'master' of https://github.com/nikestep/solarypsi
Merge branch 'master' of https://github.com/nikestep/solarypsi
Merge branch 'master' of https://github.com/nikestep/solarypsi
Refactoring config a bit
Merge branch 'master' of https://github.com/nikestep/solarypsi

Conflicts:
	config/config.php
Merge branch 'master' into bootstrap