6,angeluc2,fixed lag on startup
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy

Conflicts:
	WorkoutBuddy/src/httpRequests/AsyncHttpPostWrapper.java