add .project
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.project
add ignore
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop'
add comments
next comment
bla
remove fdt project