fixed repo update
Merge branch 'master' of https://github.com/JoeRobles/rebas

Conflicts:
	src/Rebas/ConfupBundle/Resources/private/app.js