Merge pull request #10 from kajakst/master

Factory
SearchBox updates
Nytt design (in progress)
Merge branch 'master' of https://github.com/holskil/PT2 into holskil-master

Conflicts:
	core/src/com/profiletailor/game/TabSelectionBox.java
Merge conflict resolved

LOLOL
Merge remote-tracking branch 'upstream/master'

Conflicts:
	core/src/com/profiletailor/game/Assets.java
	core/src/com/profiletailor/game/CategoriesBox.java
	core/src/com/profiletailor/game/ViewBox.java