See Jim Hamilton's discussion on "The Spirit of God in the Mission of God: Acts." Here is a snippet.
In the book of Acts we see the church baptized in the Spirit, filled with power by the Spirit (usually resulting in proclamation), and we see hints of the church enjoying the indwelling of the Spirit. One of the perennial questions facing interpreters is the relationship between the events narrated in John 20 and Acts 2. In John 20, Jesus breathes on his disciples and tells them to receive the Holy Spirit. In Acts 2 the Spirit comes on the disciples dramatically in power. In my view, these are two different accounts of the Spirit coming at different times and in different ways. In John 20 the disciples receive the indwelling Spirit. In Acts 2 they are baptized in the Spirit. There is no more conflict between John 20 and Acts 2 than there is between the baptism in the Spirit in Acts 2 and the church being filled with the Spirit in Acts 4:31.Read the rest of the post here.