Merge pull request #1 from matrix-msu/master

Master
Hierakonpolis update
Add Hierakonpolis popup
Merge branch 'batkocl1-master'