Merge pull request #4 from alffrey/master

Merge request from alffrey/astrid to OctoFalcon/astrid on Sept 3, 2014
Merge pull request #1 from OctoFalcon/master

Merge
Merge pull request #5 from adikampli/master

Merge pull request #1 from OctoFalcon/master
Search and Product transformation
Search and Product transformation
Merge pull request #6 from adikampli/master

Search and Product transformation
Product transformation changes
Merge pull request #7 from adikampli/master

Product transformation changes
Search and Product transformation
Merge pull request #8 from adikampli/master

Search and Product transformation
Merge pull request #4 from OctoFalcon/master

Merge into alffrey/astrid from OctoFalcon/astrid on Sept 5, 2014