Merge origin/master

Conflicts:
	shortener/BraveHackers/web/presentation/Mobilithon_Final_Presentation_Bravehackers.pptx
Merge origin/master

Conflicts:
	shortener/BraveHackers/web/presentation/Mobilithon_Final_Presentation_Bravehackers.pptx