Added initial integration separator support
fixed bug found by @noamshemesh, improved scrollspy
Merge develop - Deploy at 2014-08-05-19:56:18 by erik