Added point calculation and persistence for vaccination fixed loss, vaccination side effects, infection loss (severity)
Added previous wave info screen
Added side effects occurrence probability
Intellij IDEA project files are now untracked
Merge branch 'epi' of https://github.com/OpenSensing/funf-v3 into epi

Conflicts:
	funf-open-sensing-framework/src/edu/mit/media/funf/probe/builtin/EpidemicProbe.java
Added point history for each side effects, vaccination and infection. Summary of the points history is displayed on the summary screen.
Revert hidden mode flag
Merge remote-tracking branch 'origin/epi' into epi

Conflicts:
	funf-open-sensing-framework/res/layout/epi_state.xml
	funf-open-sensing-framework/res/values/strings.xml
	funf-open-sensing-framework/src/edu/mit/media/funf/probe/builtin/EpidemicProbe.java
	funf-open-sensing-framework/src/edu/mit/media/funf/probe/edu/mit/media/funf/activity/EpiDescriptionActivity.java
	funf-open-sensing-framework/src/edu/mit/media/funf/probe/edu/mit/media/funf/activity/EpiStateActivity.java
Merge remote-tracking branch 'origin/epi' into epi

Conflicts:
	funf-open-sensing-framework/res/layout/epi_state.xml
	funf-open-sensing-framework/res/values/strings.xml
	funf-open-sensing-framework/src/edu/mit/media/funf/probe/builtin/EpidemicProbe.java
	funf-open-sensing-framework/src/edu/mit/media/funf/probe/edu/mit/media/funf/activity/EpiDescriptionActivity.java
	funf-open-sensing-framework/src/edu/mit/media/funf/probe/edu/mit/media/funf/activity/EpiStateActivity.java