Change Models according to updates in ppar
MAKE SURE IT RUNS SMOOTHLY
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev

Conflicts:
	src/main/java/com/peerpen/model/Hunk.java