First checkin
Merge branch 'yii-framework' of https://github.com/Sneddo/brewpi-www into yii-framework

Conflicts:
	protected/views/site/get_beer_files.php