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

Conflicts:
	userapp.client.js

Author: Timothy E. Johansson

bower.json

@@ -1,5 +1,5 @@
 {
 	"name": "userapp",
-	"version": "1.2.1",
+	"version": "1.2.3",
 	"main": "./userapp.client.js"
 }