Merging master on develop + adding phpMyAdmin and preventing apache installation when php5-mysql is installed.