test
Initial
Merge branch 'master' of bitbucket.org:hackathon14/hackathon14
Added requirements.txt
Added witd app
Added witd app
Fixed app name
ADded db settings
Merge branch 'master' of bitbucket.org:hackathon14/hackathon14
Add homepage (bootstrap)
Merge remote-tracking branch 'origin/master'
Fixed instaled apps in settings
updated settings.py
Merge branch 'master' of bitbucket.org:hackathon14/hackathon14

Conflicts:
	hackathon14/settings.py
Static, media files
fixed satatic setting
Added draft single device view
Merged settings
Removed conflict
Fix template