User login etc finished + some bootstrap implemented
Conflict in main.gsp