Enabled profiler.
Connected SQL profiling.
Use jQuery from WebJars
fixed merge