Merge remote-tracking branch 'refs/remotes/origin/development' Conflicts: .idea/libraries/com_github_warmuuh_libsass_maven_plugin_0_2_5_libsass_3_3_6.xml .idea/libraries/org_apache_maven_plugins_maven_resources_plugin_3_0_2.xml .idea/libraries/org_springframework_boot_spring_boot_devtools_1_4_3_RELEASE.xml .idea/workspace.xml