Merge branch 'master' of https://github.com/OctoFalcon/astrid into OctoFalcon-master

Conflicts:
	common/models/product.js
Merge branch 'adikampli-OctoFalcon-master'