Merge branch 'master' into nasko
clean up
Merge branch 'nasko'
Home page changes, About changes

see above
clean up
Merge branch 'master' into Lucas-branch

Conflicts:
	PostUpNow/postupnow.pyc
Merge branch 'chr'
Stuff

Above
Merge
Merge branch 'Lucas-branch'
A change

safsfs
Merge branch 'master' into chr

Conflicts:
	PostUpNow/postupnow.pyc