Partial flight selection
Merge branch 'master' of https://github.com/CraigDem/ilwhack.namepending

Conflicts:
	application/views/assets/flights.php
Merge branch 'master' of https://github.com/CraigDem/ilwhack.namepending

Conflicts:
	application/views/assets/flights.php