Add my config
Only a log file changed - should this even be under VCS?
Get the autopopulation of test data working for me.
Merge branch 'master' into dev-branch-matt

Conflicts:
	src/iStarter/config/dev_mn.py
	src/iStarter/iStarter/settings.py
	src/iStarter/ideasapp/fixtures/initial_data.json
	src/iStarter/manage.py
Add the start of the URL support for project app.
Remove left over conflict trash.
Remove unwanted old readme backup file.
Tweak .gitignore settings.
Really simple start to the projectsapp.
Get the inheritance working.
Merge branch 'master' into dev-branch-matt

Conflicts:
	src/iStarter/logs/istarter_requests.log
	src/iStarter/projectsapp/models.py
Tidy up the model naming.
Merge branch 'master' into dev-branch-matt
removed a few .files that should be ignored
Also added dm dev config
Removed some more files that shouldnt be under git (as they change every version)
Hopefully gitignore is now working -
If other data files are showing as untracked changes (ie ive missed one) then please put in .gitignore
includes patches from my dev branch that remove data files that should be .ignored.

Merge branch 'dev-branch-daz'

Conflicts:
	.gitignore
	src/.spyderproject
Start to get the projectsapp model inherit from the ideasapp.
There was a problem with the logs directory. It contained logfiles that varied with each run thus
triggering the VCS to spot a change and want the logs checking in. These can be ignored in the .gitignore file
but by doing this the directory becomes empty and so doesnt get cloned. The next time the server is run then
it falls over because the directory doesnt exist. The fix is to put a blank .gitignore file in the logs directory.
merging .gitignore issues from dev branch

Merge branch 'dev-branch-daz'
And .gitignore is now working