commit to pull
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	res/layout/activity_profile.xml
	src/com/sro/activity/ProfileActivity.java
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	src/com/sro/activity/LoginActivity.java
	src/com/sro/activity/LoginFragment.java
	src/com/sro/activity/ProfileActivity.java
GraphSensorView
Conflicts:
	src/com/sro/activity/LoginActivity.java
	src/com/sro/activity/LoginFragment.java

a	src/com/sro/util/SensorDataContainer.java