modified .gitignore and added ember-rails and ember-source gems to Gemfile
bootstrapped emberjs and merged the two application.js manifest files in one application.js.coffee
Merge branch 'feature/GM.69750308-emberjsrails-install' into develop

Merge branch 'feature/GM.69750308-emberjsrails-install' into develop
Merge branch 'develop' of github.com:gillesmathurin/festivalgwoka into develop

Conflicts:
	fgk/Gemfile
	fgk/app/assets/javascripts/application.js.coffee