C5
Merge branch 'master' into iss53

Conflicts:
	testProject/ViewController.m
C0
C1
C2
C3
C4
C5
Merge branch 'experiment'

Conflicts:
	testProject/ViewController.m
C 10
C11
C12
C14
C13
C14
C15
C17