allala
merge test

Merge branch 'master' of https://github.com/alarkirikal/tartutrainer

Conflicts:
	TartuTrainer/bin/TartuTrainer.apk
	TartuTrainer/bin/classes.dex
	TartuTrainer/bin/classes/com/tartutrainer/R$id.class
	TartuTrainer/bin/classes/com/tartutrainer/R$layout.class
	TartuTrainer/bin/classes/com/tartutrainer/R$menu.class
	TartuTrainer/bin/classes/com/tartutrainer/R$string.class
	TartuTrainer/bin/classes/com/tartutrainer/R$style.class
	TartuTrainer/bin/classes/com/tartutrainer/activities/NewProgramActivity.class
	TartuTrainer/bin/classes/com/tartutrainer/activities/ProgramNotesActivity.class
	TartuTrainer/bin/classes/com/tartutrainer/adapters/ClientListAdapter.class
	TartuTrainer/bin/classes/com/tartutrainer/adapters/ExerciseListAdapter.class
	TartuTrainer/bin/classes/com/tartutrainer/adapters/ProgramListAdapter.class
	TartuTrainer/bin/classes/com/tartutrainer/adapters/TemplateListAdapter.class
	TartuTrainer/bin/classes/com/tartutrainer/fragments/AllExercisesFragment.class
	TartuTrainer/bin/classes/com/tartutrainer/fragments/AllProgramsFragment.class
	TartuTrainer/bin/resources.ap_
	TartuTrainer/gen/com/tartutrainer/R.java
	TartuTrainer/res/layout/activity_editexercise.xml