Test

afe
La til gridlayout
Oppdatert gridview
Bugfix main
Git
Commit to merge
R.java
Merge branch 'master' of https://github.com/pumalove/workspace

Conflicts:
	intelligenceTest/gen/com/applidium/headerlistview/R.java
	intelligenceTest/gen/com/example/intelligencetest/R.java
	intelligenceTest/src/com/example/intelligencetest/MainActivity.java
	intelligenceTest/src/com/example/intelligencetest/persons/PersonDatasource.java
Merge branch 'master' of https://github.com/pumalove/workspace

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