Update README file
Update bower json for ariatemplates
Update macro subgenerator
Refactoring
Merge pull request #2 from fab-b/master

Refactoring