bug #101
Merge branch 'feature101' into develop

Conflicts:
	application