some updates and group lasso files
resolved small conflict
Merge branch 'master' of github.com:joanbruna/prediction

Conflicts:
	nmf_linear_dynamics/test_nmf_linear_dynamic.m