initial migration to django 1.5.5
Merge remote-tracking branch 'origin/master' into django1.5migration
refactored forms.. god, they still suck >.<
removed .DS_store files