commiting all my changes
Merge branch 'v3' into v3_1

Conflicts:
	lib/app.js
Commiting to merge changes into v3
Commiting to merge changes into v3
Commiting to merge changes into v3