added basic AND and OR handling
updated ace editor