static 6
Merge branch 'feature/issue-8-static-files' of https://github.com/praekelt/oneplus into feature/issue-8-static-files

Conflicts:
	oneplusmvp/settings.py