testing
testing
Merge branch 'master' into dev-branch-kris
Altered fixtures to ensure it works with Syncdb for more than 1 app
Changed settings.y installed apps to include new app
Cleaned up code  was printing json
Merge branch 'master' into dev-branch-matt

Conflicts:
	src/iStarter/logs/istarter_requests.log
	src/iStarter/projectsapp/models.py