Merged
Merge branch 'master' of https://github.com/smartnsoft/hackathon-direct-energie-2013.git