Revert "Merge branch 'Kristian'"

This reverts commit d11b5cf7e78d853370b2a949bbee02a9f2c2b260.
Merge branch 'master' of https://github.com/pumalove/workspace

Conflicts:
intelligenceTest/gen/com/applidium/headerlistview/R.java
intelligenceTest/gen/com/example/intelligencetest/R.java
conflict

conflict