working on ui gruntfile
Merge remote-tracking branch 'origin/master'
Mini/concat gruntfile for user control page resolves #8