Update 20140620_02

Made changes to the /Subscription/Create and /Subscription/Edit views
and the SubscriptionController to handle the creation and editing of
subscriptions better.