Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into SCHOLAR-3.x
Changing the position of the lincoln vhost settings file.
Patch for disqus, patch is added here rather than d.o because it's custom to us, disqus maintainers don't care about comment_sources.  #2100
Add frankenpath to Boxes.
Update the make file for disqus.  #2100
Update make file with boxes and path file.
Remove Boxes from temporary folder
Merge pull request #2430 from openscholar/2100-update-disqus-for-make

Update disqus for make
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into SCHOLAR-3.x
Add imagefield_crop patches to make file.
Remove imagefield_crop from temporary dir.
Use commit id for imagefield_crop
#2431, fix failing services download due to changing -dev
Documental theme check in into new 3x dir. #2386
Check in to 3.x . #2421
Check into 3x.#2405
Pasted over OS Default theme CSS to so it follows basic look of projects theme. Changed projects and scholar themes basetheme to point to OS Default theme. Made minor css adjustment to scholar theme to counter act font effect from OS Default theme. #2280
Merge pull request #2413 from openscholar/2410

Changing the position of the lincoln vhost settings file.
Merge pull request #2432 from openscholar/2100-imagefield_crop

2100 imagefield crop
Merge pull request #2425 from openscholar/2100-boxes

2100 boxes