admin page
Merge branch 'master' into back
up to date
Fixed header buttons
fixed login
Renamed IMG
Merge branch 'Announcement' of https://github.com/techhatch/toky into Announcement
Merge branch 'Announcement' into mainpage

Conflicts:
	index.php
i fixed it allgit pullgit pull
Fix label nesting
Duplicate filters