cc
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
update the new ui
Merge pull request #210 from rajthilakmca/0.5

Update the new ui