Merge branch 'master' of https://github.com/bhagdave/fitzos

Conflicts:
	fuel/application/views/home.php
home.php
home.php