reverted changes, re-refactored
Merge remote-tracking branch 'origin/master'

Conflicts:
	library/vkApi.py