added some crypto for otr
added otr app
Merge branch 'master' of github.com:mfa/djangodash2013
Merge branch 'master' of github.com:mfa/djangodash2013
serve statics for development
Merge branch 'master' of github.com:mfa/djangodash2013

Conflicts:
	requirements.txt