banabananba
Merge branch 'master' of github.com:xiumeteo/omelette

Conflicts:
	application/protected/views/layouts/main.php