testing
merge
lala
add editabels
add directive userValue for checking type
small test
add json2markdown
bla
merged
leo class :=)
interfface
Merge remote-tracking branch 'origin/dev_zerocity' into leo

Conflicts:
	app/views/main.html