Avoid logging in for restricted users(Implemented logic not yet enabled)
Resolved conflicts.

Conflicts:

src/main/java/org/ednovo/gooru/shared/util/MessageProperties.java
Merge pull request #517 from VinRudramurthy/dev-branch

Avoid logging in for restricted users(Implemented logic not yet enabled)