Delete wpro to integrate as submodule next
Added wpro as submodule http://git-scm.com/book/en/Git-Tools-Submodules
Update to Wordpress 3.7.1

Conflicts:

	wp-content/plugins/wpro
Added helper files and *.submodlue to gitignore
Added disable-wordpress-*-update plugins, so you can disable update notification on heroku install
Changed config sample to allow local Development (Line 18) and deactivated CRON and AUTO UPDATE
Merged with (my) master 3.7.1 again