Update from master
Merge remote-tracking branch 'origin/master' into dev
Added contact
added build.x,ml
Added back base
Moved command
Fix errors
Merge branch 'origin/dev'
Updated jquery
Merge branch 'origin/master'
Additional Symbolic Links for Windows mk.bat script
Added support for colorpicker
Added elasticsearch
Added link
Relabel
Added link
Added emsite
Clean out link
added xconf
Added tomcat