up
Merge branch 'master' of https://github.com/vnCreature/vnCreature
Merge code
Merge branch 'master' of https://github.com/vnCreature/vnCreature

Conflicts:
	vnCreatures/res/layout/compose_layout.xml
	vnCreatures/src/com/example/vncreatures/controller/ThreadFragment.java
	vnCreatures/src/com/example/vncreatures/model/discussion/Thread.java
commit de merge
Merge branch 'master' of https://github.com/vnCreature/vnCreature

Conflicts:
	vnCreatures/src/com/example/vncreatures/common/ServerConfig.java
	vnCreatures/src/com/example/vncreatures/controller/ThreadDetailFragment.java
	vnCreatures/src/com/example/vncreatures/controller/ThreadFragment.java
	vnCreatures/src/com/example/vncreatures/rest/ServiceUtils.java