adapted configuration
mac address
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker

Conflicts:
	.classpath
	src/iiitd/mc/timetracker/MainActivity.java
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker into contextawareness

Conflicts:
	.classpath
wifi bssid added in taskRecorderService
Classpath
Delete .classpath.orig
Changes to db for schema updates

Minor updates
LocationTaskSuggestor class added
DataBase Controller minor change for testing
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker into contextawareness

Conflicts:
	AndroidManifest.xml
Merge branch 'contextawareness' of https://github.com/MC-Timetracker/timetracker into contextawareness

Conflicts:
	src/iiitd/mc/timetracker/data/Recording.java
final location task suggestions added
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker into contextawareness
null strings added to MockDatabaseController
fixed (?) Alarm to trigger suggestions ever 15 minutes
added basic implementation to predict tasks based on start time
moved addSuggestion helper function to MainTaskSuggestor and made it static
MainTaskSuggestor now generically combines any registered ITaskSuggestor accumulating probabilities using a weighted average
misc