Merge branch 'master' of github.com:akvo/akvo-flow into develop

Resolved merge conflict in:
	GAE/appletBuild.xml
Added simple persistence for datastore setting with localStorage
Device tab changes
Made small syntax changes as a result of reviewing and getting to know controllers.js
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend

Conflicts:
	Dashboard/app/js/lib/controllers/controllers.js
Fixture data for Maps
[Item #99] Let no + or space appear first in a phone number.
Defines a BaseModel that contains common attributes
Changes strings from double-quote to single-quote
Cleanup imports
- Removed unused imports
- Sort imports using Eclipse default settings
Added missing header to new classes
refactor device views
change name from assignment to surveyAssignment to be consistent with Iván's changes
Map, very basic styling.
Removes unsused field and reorder imports
Draft implementation of Survey Assignment service
Removed bubbles from map
- Map now show selected bubble as red
- Removed the bubble to open
- There is a timeing bug that needs fixing,

. #94
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend
Defines the class for SurveyAssignment injection
Convert to UNIX eol