add passenger number to estimated price calculations
Merge branch 'master' of https://github.com/Saku2/KutsuPlus-android.git

Conflicts:
	kutsuplusproject/src/fi/aalto/kutsuplus/MapFragm.java
Merge branch 'master' of https://github.com/Saku2/KutsuPlus-android.git