private
Merge origin/master

Conflicts:
	laralearn/nbproject/private/private.xml