Merge branch 'master' of https://github.com/userapp-io/userapp-angular

Timothy E. Johansson · Timothy E. Johansson · commit 9990c59f6f11 · 2014-05-21T00:20:56.000+02:00
Conflicts:
	bower.json
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "userapp-angular",
-	"version": "1.7.1",
+	"version": "2.0.1",
 	"main": "./angularjs.userapp.js",
 	"dependencies": {
 		"userapp": "latest"
