Merge branch 'master' into uat live-2016-04-04 uat-2016-04-04
-rw-r--r-- 104 .gitignore
-rw-r--r-- 233 Makefile
-rw-r--r-- 116 composer.json
drwxr-xr-x - lib
drwxr-xr-x - propel
drwxr-xr-x - www