apikeys fix and org view fix
Merge pull request #193 from morpheyesh/0.5

apikeys fix and org view fix
Merge branch 'rajthilakmca-0.5' into 0.5
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/views/users/edit.html.erb
commit with Raj's changes for the organization
cc
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/views/users/edit.html.erb