Merge pull request #2 from longpham91/master

merge
Merge pull request #5 from longpham91/master

merge
Merge pull request #7 from longpham91/Long

Long
Merge pull request #9 from longpham91/master

merge for Albert
Merge pull request #10 from longpham91/Long

update db
Merge pull request #12 from longpham91/master

update db
Merge pull request #13 from longpham91/Long

Long
Merge pull request #14 from longpham91/master

merge
Merge pull request #16 from longpham91/master

merge
update
Merge pull request #17 from longpham91/Long

update
Merge pull request #18 from longpham91/master

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
Test push
Merge remote-tracking branch 'upstream/Albert' into Albert
Merge pull request #21 from longpham91/master

update
update