user management + general optimisation
resolving merge conflict
import order autoupdate for Application.java