wtf Mate

Signed-off-by: Dsyko <dsykora@gmail.com>
Merge branch 'master' into dev

Conflicts:
	.gitignore
	.idea/workspace.xml
Changing some method and variabe names to remove ambiguitiy

Signed-off-by: Dsyko <dsykora@gmail.com>