Merge branch 'copy-from-ticdesk' of...
Merge branch 'copy-from-ticdesk' of edugit.org:Teckids/hacknfun/AlekSIS-App-Paweljong into copy-from-ticdesk
Merge branch 'copy-from-ticdesk' of edugit.org:Teckids/hacknfun/AlekSIS-App-Paweljong into copy-from-ticdesk