When I think of shoulder training, I think of militarty presses, dumbell preeses, front raises, side lateral raises,etc.  all of these exercises should be used in any successful shoulder workout. When you incorporate a full body workout into your program you can skip these exercises and give your shoulders a break for a little while with bodyweight exercises.  Exercises like all the variations of the push up are great for overall shoulder development.  Your shoulders are used almost directly in every upper body exercise or lift.  So giving them a little time off from heavy weight lifting may be just what they need.