Name Changes1
Merge branch 'master' into names
admin controll splash
Merge branch 'master' into design