Merge branch 'master' of https://github.com/zifter/ProjectX

Conflicts:
	ProjectX/ProjectX.pro
work done
delete user prop
done calculate dialog
fix some error
Merge pull request #5 from asvitenkov/master

work done