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
Ticket display & translations, price calc for multiple passengers, order
button colour
Merge branch 'master' of https://github.com/Saku2/KutsuPlus-android.git

Conflicts:
	kutsuplusproject/res/values/strings.xml
	kutsuplusproject/src/fi/aalto/kutsuplus/FormFragment.java