#
#
#
Merge branch 'master' of https://github.com/tunapanda/swagmap

Conflicts:
	test/unit/model/SwagItemModel.spec.js
added a handleXApiStatement that checks activity completion
Merge branch 'master' of https://github.com/tunapanda/swagmap