V1.2

Includes Admin, login and other changes