meh

 with '#' will be ignored, and an empty message aborts the commit.
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend

Conflicts:
	lib/JSONAPI.pm
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
merged patches
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
Merge branch 'master' of https://github.com/commercerack/backend
amazon gmt changes
Merge branch 'master' of github.com:CommerceRack/backend into 201411

Conflicts:
	lib/JSONAPI.pm