grunt server working
grunt test working
fixed broken 'grunt build' task
Merge branch 'back_to_requirejs'