regex validation for format of uk phone numbers and email addresses
Merge branch 'dev'

Conflicts:
	app/views/medications/_medication_fields.html.erb
Merge branch 'master' of https://github.com/rickbrunstedt/meditag

Conflicts:
	public/system/profiles/images/000/000/004/medium/cute-cat-wallpapers.jpg
	public/system/profiles/images/000/000/004/thumb/cute-cat-wallpapers.jpg
Merge branch 'master' of https://github.com/rickbrunstedt/meditag