py dev project problems
Merge branch 'master' of https://github.com/awanderson/photo_journal.git

Conflicts:
	Mobile Application Backend/.pydevproject