rails generate mailer SubscriptionMailer
mail sent on new subscription
add postgresql for deployment on heroku
event code moved to settings file
Merge branch 'subscription-email'

Conflicts:
	config/initializers/application_settings.rb
fix header links
change openid signin sidebar to follow_us
fixed subscriptions factory using fixture_file_upload
add images for social links
fixed images of partners
seed for articles, db fix, added pagination to articles
improved pagination of articles, fix on login pwd field, article editing hidden for non signed in users and other stuff
add this as stated in https://devcenter.heroku.com/articles/getting-started-with-rails3
fix to get the application url correctly on heroku
force heroku to use the correct ruby version
enable application-print.css precompilation
Merge branch 'heroku-specific'
added some tests and done some rework on articles controller
fix on time zone to use, fix on articles preview, improvemnts on date format and headlines
improvements on article editing, added tinymce