Fixed "1969" date bug
Added button that can trigger file upload regardless of network connection type
Fixed upload button layout bug and cancel upload if there are no files
Merge branch 'datacollector_gcm' of https://github.com/OpenSensing/funf-v3 into datacollector_gcm

Conflicts:
	datacollector/src/dk/dtu/imm/datacollector2013/MainActivity.java (Resolved)