Merge branch 'master' into txxx_bugs
ticket: xxx fix NPE bug in NetworkManager
Merge branch 'master' of github.com:42cc/p2psafety
ticket:87 Added djcelery to the project
ticket:00 Merge branch 'master' into staging
ticket:00 clean up
ticket:00 Another clean up
ticket:87 Broght back good old user&pass for db
ticket:87 Merge branch 'staging'
ticket:87 celety -> celery_app due to import problems
ticket:87 Finishing with celery -> celery_app renaming
ticket:87 Merge branch 'staging'
Merge branch 'master' into t61_map_on_supporter_screen