added balance fragment
some change
refactored variables
Merge branch 'master' into database and changed category field from title to name

Conflicts:
	UbiLearnProject/src/no/ntnu/stud/ubilearn/db/DatabaseHandler.java
	UbiLearnProject/src/no/ntnu/stud/ubilearn/fragments/wiki/Article.java
	UbiLearnProject/src/no/ntnu/stud/ubilearn/fragments/wiki/Category.java