Some refactoring
Merge branch 'master' of https://github.com/nankh/fyp-2012

Conflicts:
	fyp-2012.pro