added doc blocks to all files i have edited (i think)
Merged 'develop'.
Finish index-sam