Updated sass structure / files
Updated assets before merge
Updated files
Beginning dev in `develop` branch