complete layout of the Register page
complete layout of the Register page
Merge remote-tracking branch 'origin/master' into samuel

Conflicts:
	app/src/main/java/com/example/gebruiker/pickler/CreateAccount.java
	app/src/main/java/com/example/gebruiker/pickler/Login.java
	app/src/main/java/com/example/gebruiker/pickler/MainActivity.java
New class created to upload images.
App now can upload/download images from ftp.
Merge remote-tracking branch 'origin/samuel'
Merge remote-tracking branch 'origin/uchoa'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/gebruiker/pickler/SwipeGlobalPage.java
Merge remote-tracking branch 'origin/uchoa'
Resulting merge!
complete Create Pickle page
change the buttons style
image default (side menu)
remove the class ImageViewRounded
Merge remote-tracking branch 'origin/samuel'

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/gebruiker/pickler/CreateAccount.java
	app/src/main/java/com/example/gebruiker/pickler/CreatePickle.java
	app/src/main/java/com/example/gebruiker/pickler/Login.java
	app/src/main/java/com/example/gebruiker/pickler/MainActivity.java
	app/src/main/java/com/example/gebruiker/pickler/NavigationDrawerFragment.java
	app/src/main/java/com/example/gebruiker/pickler/domain/User.java
	app/src/main/res/layout/fragment_navigation_drawer.xml
Final merge working!!
Final merge working!!
Swipe implemented and working

Http Request for array working

Global Variable User created