Merge branch 'master' of github.com:flowerett/ticketee4
Merge branch 'hotfix/heroku'
Prepare for Heroku
update rails to 4.0.0.rc2
Merge branch 'hotfix/Rails4RC2' into develop