Update subscription action in subscriptions controller.
Merge branch 'master' of github.com:piinthecloud/SeeMore-Aquamarine

Merge conflicts.