New UI changes
Merge pull request #207 from thomasalrin/0.5

New UI changes
update gems rails to 4.2 rc2
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock