update ontid contract; merge to solve pr#7;#11

Merged

MickWang merged 7 commits intoontio:masterfrom MickWang:master

Apr 9, 2018

+598-173

Commits on Apr 8, 2018

merge and solve conlicts
ONTO-app
committed

Commits on Apr 9, 2018