Merge branch 'master' of https://github.com/iagainstiapp/koodi

Conflicts:
	js/base.js
paskaa
Merge branch 'master' of https://github.com/iagainstiapp/koodi

Conflicts:
	js/base.js