Add marks and idea files
Add MarksProvider
new diagram view
geron
Some trash commit
Add Moskvin's marks
Change API version
fix .gitignore
Merge branch 'master' into marks

Conflicts:
	.gitignore
remove trash
remove trash. part 2
Merge branch 'master' into marks

Conflicts:
	.gitignore
rm trash 2
update version