fixed urls git merge comments
added global forms and views