Massive Commit
Added activity main?
Merged master into branch
Merge pull request #6 from boukisn/av_branch

Gui update