first changes to advanced aams
final changes
Merge pull request #8 from nontas/advanced

Advanced AAMs
Adds first versions of CLMs and SDMs basic notebooks
typos
Merge pull request #9 from jalabort/clm_sdm_notebooks

Adds first versions of CLMs and SDMs basic notebooks
Merge remote-tracking branch 'upstream/master' into aams

Conflicts:
	notebooks/Deformable Models/AAMs Advanced.ipynb