some small changes
Merge branch 'master' of https://github.com/dimce011/campus201305.git