- Fixing some bugs
Merge remote-tracking branch 'origin/samuel'

Conflicts:
	app/src/main/java/com/example/gebruiker/pickler/CreateAccount.java
	app/src/main/java/com/example/gebruiker/pickler/Login.java
Merge remote-tracking branch 'origin/samuel'
Merge remote-tracking branch 'origin/samuel'

Conflicts:
	app/src/main/java/com/example/gebruiker/pickler/CreateAccount.java
User now can take a picture for your profile
  --- Some bugs to be fixed. When you select some photo.
JSON Response now returns the user data to login and create forms
Pickler App now can retrieve images from database
JSON Response now returns the user data to login and create forms
Pickler App now can retrieve images from database
 Check Internet Connection
  - Login screen check internet connection, if there is not internet connection the app is closed
  - Manifest have the permission to access NETWORK

  Portrait Orientation
   - All activities have portrait orientation

 Development of the swipe screen for global pickles
  - EndlessSwipePickles is used to make the endless swipe. Also show the content of the PagerAdapter
Development of the swipe screen for friends pickles
  - Same as Global
New class created to upload images.
App now can upload/download images from ftp.
Merge remote-tracking branch 'origin/samuel'
Development of the swipe screen for friends pickles
  - Same as Global
Merge remote-tracking branch 'origin/uchoa'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/gebruiker/pickler/SwipeGlobalPage.java
Development of the swipe screen for friends pickles
  - Same as Global
Development of the swipe screen for friends pickles
  - Same as Global
Merge remote-tracking branch 'origin/uchoa'
Resulting merge!
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!!
layout of My Pickles
change text color of the side menu (white)
progress bar implemented