Merge pull request #43 from vikinghug/development

Update from Development
Merge pull request #46 from Crowdedlight/master

Removed Resizing
Merge pull request #47 from vikinghug/master

Merge pull request #43 from vikinghug/development
Merge pull request #48 from vikinghug/development

Removed resizing
fixing shield bar bug
Merge pull request #8 from vikinghug/development

Development