settings should not be stored in git
ec2 should work
Merge branch 'dev' into mark
Merge branch 'dev' into mark

Conflicts:
	freeeed/settings.properties
Merge branch 'dev' into mark

Conflicts:
	.gitignore
still playing with gitignore
change structure