Merge commit '9cbd8c45dc1b17e873328628a918a9617a2dedf9'
Refactor code : move the entity to entity package
Merge commit '6667bb508d3ec1745bc5f2dfb35af2221e8a1f14'
add user profile page
Merge commit '360139511abd24559b4321605f20286992a80fcf'

Conflicts:
	bower.json
merge code for bower.json
Linked login service
Merge commit 'aeb2ded4ada41e470a30d35146baa2a984b99d13'