some other fix that i can not remember, but is fixed!
Merge remote-tracking branch 'origen/master'

Conflicts:
	.idea/workspace.xml
some changes