ng ver
Merge branch 'master' of https://github.com/scbd/absch.cbd.int

Conflicts:
	bower.json