edit grunfile, kama fix run app
edit merge
Merge branch 'develop' of https://github.com/chonla/geekytodo into develop