CAPSTONE FINAL MERGE

Note - Further changes in master for assets