Intial commit
Updated grunt tasks
Added missing files
Fixed merge