Merge pull request #130 from maxirosson/dev

Dev
Merge pull request #131 from maxirosson/dev

Dev
Merge pull request #132 from maxirosson/dev

Dev
Merge pull request #133 from maxirosson/dev

Dev
Refs #97: Smart Selection Algorithm
Merge pull request #135 from maxirosson/smartSelection

Refs #97: Smart Selection Algorithm
Configuring app to support the deploy on Amazon