Rigged eclipse project
Merge branch 'DBA1'

Conflicts:
	.gitignore