fortat
Merge branch 'master' of https://github.com/adynetro/collectin

Conflicts:
	.DS_Store
	www/js/app.js
Revert "added device plugin"

This reverts commit 73124a25f7143959a73c6b9da3c9986a6cb5840c.
fixed index