added empty rakefile to comply with heroku
Merge branch 'dev'