Fix .project issue
Fix stupid eclipse file issue
Merge branch 'master' of https://github.com/johnpwillman/stowaway
Merge branch 'master' of https://github.com/johnpwillman/stowaway

Conflicts:
	Gemfile.lock
Change date_field to text_field on plan edit page for debugging