Merge commit '9cbd8c45dc1b17e873328628a918a9617a2dedf9'
add user profile page
Merge commit '360139511abd24559b4321605f20286992a80fcf'

Conflicts:
	bower.json
merge code for bower.json