* 'master' of https://github.com/thelia/thelia: (38 commits)
add propel connection in transactions
remove area to area_delivery_module
add an area to a delivery module
create shipping zone area form
update readme
start shipping zone management
complete admin log message
allow to create a new area
delete area
add pre/post methods in Area model
display error message
update area postage
add missinf files
remove country from area and start creating postage management
add country to as area
start area configuration tempalte
choices access through smarty
tax rule creation
downgrade smarty version
create all area events
...
* 'master' of https://github.com/thelia/thelia:
fix issue concerning absoluteUrl
do not display some information about template file
escape view parameter
* 'master' of https://github.com/thelia/thelia: (102 commits)
add higher priority to module routing
update smarty version
select default country in front register form
add modal error id changing default country failed
enabled change default country
fiw module generator class name issue
complete javascript for changing default country
validate country removal
validate country creation
implement abstract method from AbstractCrudController in Country Controller
create country action class
add pre/post CRUD method in Country model
create coutry events
finish customer address update
complete readme
update .gitignore file
add specifig php.ini file for travis
try to fix travis conf
remove unused directory
check session directory permission in install process
...
