Add loading screen
Merge branch 'master' of https://github.com/spring-peepers-2014/Giggidy

Conflicts:
	giggidy/app/controllers/users_controller.rb