added user profile page
Merge branch 'master' into pageDevelopment

Conflicts:
	Askja/src/com/askja/swing/HomePage.java
Fixing merge mess
Merge pull request #15 from armannds/pageDevelopment

added user profile page