UI
Merge branch 'master' of https://github.com/dfan1028/Lucas

Conflicts:
	EmailApp/EmailApp.pro.user