Merge pull request #1 from OctoFalcon/master

Merge on 3rd Sept
Merge pull request #2 from OctoFalcon/master

Merge on 4 sep
LoginIdentityHandler added
loginIdentityHandler is added
Added argument to product
Merge pull request #11 from SurojitMandal/master

Merge into local 5th sep
Merge pull request #3 from OctoFalcon/master

Merge into local 5th sep
Merge pull request #10 from adikampli/master

Added argument to product
Merge pull request #4 from OctoFalcon/master

Merge from OctoFalcon/astrid to SurojitMandal/astrid
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/model-config.json
Merge branch 'master' of https://github.com/SurojitMandal/astrid
Merge pull request #12 from SurojitMandal/master

Merge into OctoFalcon/astrid
Merge pull request #6 from OctoFalcon/master

Merge into local repo