Added lexer for expression
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/app/views/functions.html