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

Conflicts:
	freeeed/settings.properties
do not track private files
comment .gitignore
Merge branch 'dev' into mark

Conflicts:
	.gitignore
still playing with gitignore
change structure
metadata tests
tests cleanup
do not track logs/ in git
release notes tracking
ivan merged to dev