woops
reset head so development can finally start
fix documentroot bug in openshift. edit .httaccess
please work
Merge branch 'master' of github.com:SenApps-Systems/unleyroadtraders-senapps.rhcloud.com

Conflicts:
	.htaccess
cleaned .gitignore might be the root cause of problems