login by name or email

src/main/app/templates/welcome.html

@@ -22,7 +22,7 @@
 				<div class="feedback alert alert-danger" ng-if="message">{{message}}</div>
 				<form ng-submit="login()">
 					<div class="form-group">
-						<label for="username">User Name</label>
+						<label for="username">User Name or E-mail</label>
 						<input type="text" name="username" class="form-control" ng-model="model.name"></input>
 					</div>
 					<div class="form-group">