Modified Gemfile
Merge branch 'master' of github.com:betacube/betacube.eu

Conflicts:
	Gemfile