..
..
Merge remote-tracking branch 'origin/master' into Remi

Conflicts:
	TestApp/src/com/example/testapp/MainActivity.java
	TestApp/src/com/example/testapp/fragments/ListFragment.java
	TestApp/src/com/example/testapp/json/GetElements.java