fixed parallax
Merge branch 'master' of https://github.com/leroyakg/Manager

Conflicts:
	protected/views/site/index.php
	public/css/app.css
	public/css/app.css.map