waqas comment

waqas comment
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/org/orangedevelopers/onlinestore/controller/LoginController.java