Added Fake database
Finish SQLLiteDB
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'develop'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'master' of https://github.com/erik33045/pyum
Merge branch 'master' of https://github.com/erik33045/pyum

Conflicts:
	pyum/settings.py