More changes based on RailsBP
More changes based on RailsBP
More changes based on RailsBP
More changes based on RailsBP
More changes based on RailsBP
More changes based on RailsBP
More changes based on RailsBP
More changes based on RailsBP
Updated conflicts
More Updates based on RailsBP
More Updates based on RailsBP - replace instance variable with local variable for _form.html.erb
Merge pull request #95 from alim/development_Joe

More Updates from RailsBP
Merge branch 'development' into Issue_77_Code_Analyzer_Refactor

Conflicts:
	app/models/subscription.rb