added security fix for plupload
added wrong patch
removed 2 patches due to error on site install
removed permissions for not enabled modules
rebuild dev .build
resolv merge conflicts
resolved merge issue
added function to set IMCE on install
added function to set IMCE on install
fixed messed up .build file
fixed 77f53a9
fixed database error
updated tavis testing
hopefully fixed travis mail problem
hopefully fixed travis mail problem
merge with 1.x-1.x