made slash after .admin optional
some small graph fixes
Merge remote-tracking branch 'origin/angularjsImplementation' into angularjsImplementation