Updating requirejs and backbone
Merge branch 'master' of github.com:hub43/basbosa

Conflicts:
	package.json