[DEV]add *.pro to the git
Merge branch 'master' of git@github.com:nearc/renkou.git into remote-master

Conflicts:
	ui-wizard/newprojection/newprojection.pro