Uncommited refactoring changes
Merge pull request #53 from rochimensi/rmensi/20140915/RefactorAppStructureAndGrunt

Uncommited refactoring changes