rc4
merged development
reverted a change for selenium. Will come in next commits