regular updated
Merge branch 'master' of
https://github.com/YCHackthonSmarking/YC-Hackthon.git

Conflicts:
	src/main/java/net/smarking/hackthon/controller/ProviderCtrl.java