Transitions
Merge branch 'master' of github.com:faizalzakaria/dash_app

Conflicts:
	app/controllers/landing_pages_controller.rb