Merge updates of rscarvalho in branch 'master'

Conflicts:
	Gruntfile.coffee
	assets/src/coffee/controllers/regex_parser.coffee
	public/index.html