...
...
Merge branch 'master' of https://github.com/soa-masterclass/clickpay.git

Conflicts:
	src/main/java/com/cgi/soa/masterclass/clickpay/faces/TransactionController.java