Signed-off-by: xtech86 <tony@jevents.net>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Signed-off-by: xtech86 <tony@jevents.net>
Flat Layout Fixes and general config page CSS Adjusts.

Signed-off-by: xtech86 <tony@jevents.net>
Signed-off-by: xtech86 <tony@jevents.net>
Merge pull request #171 from xtech86/master

Flat Layout Enhancements and edit page.