07-07-2014 1913
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/index.html