Merge pull request #1 from DustyLenz/master

Added Gui files
Merge pull request #5 from longpham91/master

merge
Merge pull request #6 from longpham91/master

merge
add schema
Merge pull request #7 from longpham91/Long

Long
update db
Merge pull request #10 from longpham91/Long

update db
update
update
Merge pull request #13 from longpham91/Long

Long
Merge pull request #16 from longpham91/master

merge
update
Merge pull request #17 from longpham91/Long

update
Merge remote-tracking branch 'origin/Luke'
Updated GUI

Luke "fixed" crashes
Merge pull request #19 from longpham91/Long

update
Merge pull request #20 from Superenergiez/master

update
Merge pull request #23 from longpham91/Luke

Merge pull request #19 from longpham91/Long
Merge remote-tracking branch 'upstream/master'