remove org controller
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge pull request #156 from indykish/0.5

update megam_api gem version to 0.24
oneservice fix
efefMerge remote-tracking branch 'origin/0.5' into 0.5
fewbugfixes
Merge pull request #157 from morpheyesh/0.5

0.5 - oneservice not fixed yet!
cc
Merge remote-tracking branch 'origin/0.5' into 0.5
changes
small addon fix -parent:#151
css changes
Merge pull request #160 from morpheyesh/0.5

0.5
move rails to 4.2.beta4
Merge remote-tracking branch 'origin/0.5' into 0.5
deleteapp
efefMerge remote-tracking branch 'origin/0.5' into 0.5
deleteapp
Fixed API Key Tab
Merge remote-tracking branch 'origin/0.5' into 0.5