Merge branch 'pro' of github.com:torkelo/grafana-private into pro

src/app/partials/pro/login.html

@@ -29,10 +29,10 @@
 			</div>
 
 			<div class="login-oauth text-center">
-				<a class="btn btn-primary" href="/oauth2/google" target="_self">
+				<a class="btn btn-primary" href="/login/google" target="_self">
 					Sign in with Google
 				</a>
-				<a class="btn btn-primary" href="/oauth2/github" target="_self">
+				<a class="btn btn-primary" href="/login/github" target="_self">
 					Sign in with Github
 				</a>
 			</div>

src/app/partials/pro/sidemenu.html

@@ -2,7 +2,7 @@
 	<div class="dropdown">
 		<a class="pro-sidemenu-link pointer gravatar" data-toggle="dropdown" title="{{grafana.user.email}}">
 			<span class="gravatar-missing">f</span>
-			<img src="{{grafana.user.gravatarUrl}}" width="35"> <span class="gravatar-email small">{{grafana.user.login}}</span>
+			<img ng-src="{{grafana.user.gravatarUrl}}" width="35"> <span class="gravatar-email small">{{grafana.user.login}}</span>
 		</a>
 		<ul class="dropdown-menu">
 			<li><a href="/login?logout">Logout</a></li>