get code
Merge branch 'master' of https://github.com/thiendv/DAM.git

Conflicts:
	project.properties