cloud settings fix
Merge pull request #199 from rajthilakmca/0.5

Fixed issues
Merge pull request #200 from morpheyesh/0.5

cloud settings fix
upgrade rails to 4.2 rc1, megam api to 0.29
Merge pull request #201 from indykish/0.5

upgrade rails to 4.2 rc1, megam api to 0.29
email error fix
Merge remote-tracking branch 'origin/0.5' into 0.5
new ui changes
Merge pull request #202 from thomasalrin/0.5

new ui
cc
Revert "new ui"
Merge pull request #203 from megamsys/revert-202-0.5

Revert "new ui"
fog gem change
Merge pull request #204 from thomasalrin/0.5

fog gem change
updated tmp file
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	Gemfile.lock
Merge pull request #205 from indykish/0.5

updated tmp file
list all hp images
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge pull request #206 from thomasalrin/0.5

list all hp images