T4 adslfkjasf
Merge branch 'release/20131112' into develop
Merge branch 'feature/T4' into develop

Conflicts:
	hello
Merge branch 'hotfix/20131112.1' into develop
T5
Merge branch 'feature/T5' into develop
Merge branch 'release/20131112.2'