something
fixed merge
stuff before easter
something
merge fix
wiki and sync and stuff
fixed nullpointer in training
Merge branch 'parse' of github.com:espehel/UbiLearn into parse
change name to handbook
Merge branch 'parse' of github.com:espehel/UbiLearn into parse
Merge branch 'master' of github.com:espehel/UbiLearn into parse
change the version number, and fixed bugs
Deleted some code that no longer is relevant, added comments and a minor change in page related to achievements.
Updated balance fragment
Merge branch 'master' of github.com:espehel/UbiLearn
small change
Merge branch 'practise'

Conflicts:
	UbiLearnProject/src/no/ntnu/stud/ubilearn/db/DatabaseHandler.java
Moved all practise classes to its own package
can now add new patients