Merge pull request #29 from vinkobuble/develop

POPS-269 show pop on timer expiration only once if timejust expired.
POPS-256 half way-done
Merge pull request #30 from vinkobuble/develop

POPS-273 calculate cut-off time in Java
POPS-251 / POPS-254 - IE bug fixes to scollTo position and MySelections gradient issue
POPS-262 - Salutation fixed, backed out of timestamp change i made in header.html (sorry  vinko)
POPS-272
is expired method
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop

Conflicts:
	core/src/main/java/com/mycompany/pops/pojo/FlightData.java
POPS-258 The ability to pass the json string on the url. Encrytpion is not implemented yet.
POPS-279 / POPS-276 / POPS-280 - Order confirmation text updates, link style fixes order confirmation email fix for outlook
preparing for future: apache commons ftp
Merge branch 'develop' of https://github.com/mjm0therway/pre-order-broadleaf-repositor into develop
POPS-260 POPS-261
Merge branch 'POPS-265' into develop
POPS-265 intermediate
Merge branch 'develop' of github.com:mjm0therway/pre-order-broadleaf-repositor into develop
POPS-265 Hide flight and meal selections if the flight has departed