add quick uml diagramms

by http://www.objectaid.com/home
update gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore