Merge pull request #6 from MonekyWithAWrench/InDev

Added front "splash screen" tab.
fix for traits NRE
Cleanup after PR merge
Fix again
CsProj fixed
General fixes, code cleanup
Merge pull request #1 from LtStingray/InDev

Update 1 from master