reindented file
Fixed a bug when someone logs into the site for the first time with it not initializing the relationship between Settings and User properly so we got nullpointerexceptions elsewhere
Reindented file
Reindented file and organised imports