License change from Apache to GPLv2 on Web Controller area
Merge branch 'master' of https://github.com/OpenSourceConsulting/athena-peacock.git