styling log in page part 2
Merge branch 'develop' into styling
ignore some war files.
Merge branch 'styling' into develop