Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
New Branch
gitignore aangepast met ignore bin en ignore lock
Fixed animaties
comment changed
Dit is logischer
Supermarkt icoon transparant gemaakt
Haal een lijst van Companies op per type (tid)

tids moeten nog in de database
Workflow
Facebook login fixed, staan nog wel wat rare buttons bij. Die gaan weg. Wanneer je ingelogd ben zie je dat staan.
Facebook lib added
Fixed Facebook Login, added profile picture, hid some elements when the user is logged in to Facebook through the app.
Eclipse had een suggestie.
Merge pull request #8 from MoveLife/Armindo

Armindo branch
Some small changes to the login screen (fixed showing the profile picture after the login process) and editted the title of the facebook-login-screen.
Mergin master into branch