added tests for rewards app
added line to vagrant file that enables us using the pycharm debugger with the vagrant vm
Merge pull request #437 from Bartzi/adding_tests

adding tests for rewards app
Merge remote-tracking branch 'upstream/master' into new_userprofile

Conflicts:
	evap/fsr/fixtures/minimal_test_data.json
	evap/fsr/tests.py
fix rewards app and rewards tests for the new userprofile
more migration fixes. delete old tables. properly disable the backwards migration.
add some forgotten fields to the userprofile in the admin view